Fix for 'Issue_352'.