Warrant edit bug hot fix