Resolve bug map