Fixing an issue that caused our app to break