Partial fix #611 (avoids status change but no messagebox)