Resolved a funky inheritance issue