Fixed inheritance issue