Workaround for a nick change issue in cinch