Fixed bug introduced during cleanup