2nd attempt at fixing #10