Fix for ticket:124.