#bugfix: not returning current flag