fixes the 500 page - SPOT-494