Final fix added