Workaround for #179