Little code completion fix
Merge origin/master