Fixed problem resulting from previous fix