Attempt to fix bug #53