further closing of #592