apply change from @gvdvenis in #1