BUG: Corrected inheritance bug