Fixed the parent class calls