flags got lost in branch switch... restoring