improve bug561