I'm pretty sure I fixed that, but somehow it got erased by the merge