Possible fix for #474