Maybe fix for Issue #436