did it really take me 4 commits to fix this?