Extra debugging in RC branch to be merged back to master

Some more explicit debugging for issue #149.