Fixed for tests #344