implementing #193