#57,#58 issue fixed