fixing important bug #80