Refugio Whitelaw lock-fix9949