ticket: 3 Code corrected