Reverting Changes done to inherit call because of assertion failue issue #35