Sone-096 Fix [ COMPLETE ]