possible fix to #924