fig build support
bugfix