fix Bug428

fixes #428 

NOTE: this series is a candidate for the stable branch