Quick fix on inheritance