blind attempt at fixing #51, #48