Fix isssue 863 by phg