Possible fix for #339 (?)