Fixed bug with completion