More permanent fix for #16