bug fix in master v1.1