Reverted a previous fix that is causing errors