Fix for ticket:135.