#961 - fixes failing tests