Going from 2.0.6 to 2.0.8 & errors

[drkameleon]

It obviously make sense. As for the coding style, I obviously think it was 
quite sketchy, especially in the implementation of this particular command. 
But, let's see...

Thanks! :)