Issue 128

this should solve issue #128