Fix for regression from previous fix