Fixed the order issue on autupay for issue #1