Incorrect inheritance of Entity and Subscriber fix