making the implementation match the comp (more closely)

Signed-off-by: Gary Paige <gary@theoryblister.com>