attempt at fixing #10