This should fix issue #11