Add fast-path for comp