Bug in parsing commands but we'll fix that