reapplying fix for #11