Added a backwards compatible fallback to the changes made in PR #173