1.3.4: fix bugs at 1.3.2