Hopefully fixed issue with chain removal.