This should fix issue #1508