ACTUALLY fixed bug
Merge