Simplify construction to avoid issues