Fixing issue #1104 and updating tests.

Merci! Thanks for the good work and cracking down on those issues. Very much appreciated.