Code reduction for #147