bugfix with CLI