Tweaked to compensate for no value returned