see #33 for follow up