Fixed issue with mode-less execution