Uncommited code before 1.6 update (FIXED)