Fix a bug that would cause application to break after August 1st