Try to handle Issue #283