this is yet another step towards fixing #235