Both issue fixed.