Merge "Fixing wrong target check"