fix for Issue 1479