Dealing with a bug...