Extra trace - fixes #649