Fixed a completion bug thanks to Geof