#728 - fixes failing tests