Hack code to remove double logging