FBS Expert Bugfix