Use fork of close tag that has less crashing