Workaround for #226