Fix creating of tables only if not existing