Issue 137

this should solve Issue #137