Supposed fix issue #7