Workaround for #74