Sone-248 - Fixed