Small workaround for #231