Fixed bug #466586 part 1