Fixed bug introduced in [8cc13f7]
fix bug in [832c428]