Fixes 368, change back