Bug fix for Sanctuary users