Blind attempt at fixing #8