Fix  bug #13