resolve ticket #137