Prevent coverage from being reported wrong
Slightly reoder some code