Unit special fix