Actually fixed bug (I hope)