Restored previous fix