Slight improvement to trigger pattern