Fixes space handling