this change doesn't seem related to the problem. if that's the case, let's have it in a different PR