Reverted the most recent fix (caused an issue)