work and almost full fix of issue #2