TICKET#1234: Fixed code