Attempting to resolve a bug...