Reverted previous fix