Fixed running of single item issue. Might be at the expense of a toplevel bug fix