Fast fix for 500