Fix for Issue#1165