Fixed issus: #19,20
Fixed issus: #19,20