Fixed issue 125
Fixed issue 126