[PATCH 0/2] Fix bug #80 again