Intermediate fix for #56