Maybe a fix for #289