Fix of bug #1