Fix for NotImplementedError