second possible fix for #14