Fixed a bug that only manifested in production App Engine