Removed my workaround from before