issue#1 fixed