Temporary solution for Issue #446