Workaround for #4