Fix #23 again for the other cases