another step towards fixing #214