SFMBarracks.tw fix

gheimhridhrequested to merge
gheimhridh/fc-pregmod:SFMbtwfix into pregmod-master

Possible fix for these two situations: 1 2

Merge request reports