fixes issue #911
added backward compatibility check.
Merge pull request #924 from ne0fhyk/fix_issue_911

Fixes issue #911