Bugfix in invariant fields popin
Merge dev