workaround for issue #6 and release 2

workaround for issue #6 by reverting code to older and release 2