Actually fixed bug