One quick modification so that aforementioned hacks are stable with test suite.