Fix states for better inheritance #5934
Merge pull request #15 from priyankarani/develop

Fix states for better inheritance #5934