@todo fix newly introduced unintentional flip