removing changes which appear to be causing bug reference in issue #16