* fix bug #605.
 * fix bug #603.