Fix for making inheritance easier