Fixed a bug that would bite my ass later