Attempt to fix bug #27