Fixes #93
Merge branch 'hotfix/double_tables'