fix null lock
use 2 step proxy replacer, because of issues with the one-step one
no abstract method modification