bug fix of commit 3e2bce2