Restricted zones, fixes #624