Fixing it so it doesn't 500