Fixed broken inheritance