via z9hG4bK issue. Bug #663