Minor change
Fixed #138, #139