Site Control: Fix attempt #3