Updated for Fuse 6.1