modified for Fuse 6.1