Trying to fix bug #21