[WIP] #3527 Fixing spaces