Better fix for stupid garrisons