Note to self: review if this one line change is really necessary.