Fixed: 5th commit in issue2