attempt at fixing #46