Bug fix: Yeepay