updating issue #490 to apply comments of Xavier