fix continue BEFORE log statement
shorten deep cloning to a single line