* fix bug #544,545.