Bugfix/1068093v2

Random spaces are being added here and above.