Workaround for #63