possible fix for #315