Fix for it currently throwing error 500's