[MOD] Fixed and tested