Fix for rig ghosting

See issue #52 for notes