Finally fixed issue with backword compatibility