fix for tests. see also http://goo.gl/iTi3Y for more info on fix