implemented #121 #125