Fix an inheritance issue (probably) caused by merge