Fix silly bug and refactored magic method from base class