Fixed lots of spaces at completion