Fix for #1009 backwards compatibility pre 3.5