CON-1064 | Fixed spaces