Workaround for #3