Fixed a remaining case of bug #85

This fixes one remaining case where bug #85 still occurs.