Final fix commit