Fix #474 isssue 2