Backend improvement for #155