Issue#1688

This is a fix for #1688