Fix symptoms of #18; unsure if I have address the root cause though