closes # 2578