Payment form was not charging the shipping fee on some transactions