Partly fix for #204