Bypass logic where possible