Fix flipping

Merged payno requested to merge fix_flipping into master

Merge request reports