The invention relates to a method of Dixon-type MR imaging. It is an object of the invention to provide a method that enables efficient and reliable water/fat separation using bipolar readout magnetic field gradients and avoids flow-induced leaking and swapping artifacts. According to the invention, an object (10) is subjected to an imaging sequence, which comprises at least one excitation RF pulse and switched magnetic field gradients, wherein two echo signals, a first echo signal and a second echo signal, are generated at different echo times (TE1, TE2). The echo signals are acquired from the object (10) using bipolar readout magnetic field gradients. A first single echo image is reconstructed from the first echo signals and a second single echo image is reconstructed from the second echo signals. A zero echo time image is computed by extrapolating the phase of the first single echo image at each voxel position to a zero echo time using the phase difference between the first and the second single echo image at the respective voxel position. Flow-induced phase errors are identified and estimated in the zero echo time image, and the phase of the first single echo image is corrected according to the estimated flow-induced phase errors. Finally, a water image and/or a fat image are reconstructed from the echo signals, wherein signal contributions from water and fat to the echo signals are separated using the phase-corrected first single echo image and the second single echo image. Moreover, the invention relates to a MR device (1) and to a computer program to be run on a MR device (1).