Fixing previous bug >_<