further fixed #28 (100 commits :joy:)