Fixed bug resulting from my previous change