Hopefully fixed the inheritance issue...