bug fix in 10f1e8a