Should fix bug #36