updating ticket #490 to cover the comments of Xavier.