Really fixed bug now