Fixed block not called if lock already owned