957049 - Fixing 500 error from pressing enter