Initial fix for #410