Fixing some broken logic after methods were moved around.

Signed-off-by: Ben Corlett <bencorlett@me.com>