Fixed space issue, want better way though (messy hack)