Code fixed

Pull req