Try to resolve end mismatch issue