Resolving bugs