revert ghetto fix to correct fix