this is basically a fix for #12