I got the issue fixed with the help of @Nostrax. I'm getting ready to release it now.