Fixing #760588