Adding #137 changes