Removed optimization, had a weird case where it didn’t work.