Attempt to fix bug #17