Fix for #12, workaround for #13