Added tracing to track down observed bug