issues #3599 and #4252