WTF I thought I fixed this bug
Merge