Same issue, is there any solution to this?