Minor modification of flame_wrapper