Added small tweak to help cleanup the mess from the bug I fixed last commit