temporarily reverted fix for issue #31 because it caused errors in some queries