Some Bugs Fixes 1.6.6.6