This is a workaround for #119