temp fix #12,896