temp fix to #1388