Fix for feature #1496