Minor optimization fix in Unclaim