#261 was merged, i think you can simplify here.