Fix Issue #1041

This works for me