oh, didn't see that. though i think it's not related to this particular commit and should be moved to separate one.