Workaround for #14