cleanup after fixing #10