Workaround for #29