Hot fix for Adam/Alissa's issue.