another stab at a fix for #11