Fixed a backwards compatible problem