Version 2.3: fix bugs.