Bug/iss137

My attempt to fix a bug.