#385 Add convenient variant