new bugs introduced by previous revision, V1.0.4