ACTUALLY fixed bug