Simplify for performance reasons