Fix broken inheritance issue