Bug with command preparation