Fix/skip prompt

Fixed and tested version of #1470

Please review and merge