FIXING MORE AND MORE :D

:)