Issue 27: fix single script invocation