adding #137 changes