[trunk] Fix issue with & vs &&