fixed issue reported by sander