Pull request for Issue665

@dretrex 
@davidChevrier 
@davidChevrier, same question.