Fixed a bug in calling super