Fixed a bug in my last commit