bug fixing for 1.0

(from redmine: created on 2013-11-04)