fix for issue #136 #137