bugfix shell macros