Fixed bug introduced from previous patch