'Fix' for Issue 11

this should fix issue 11