Fixed issue with __super__. Covered with specs.