bugfix for commands entities