Debugging for #1087

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
Fix #1117

Signed-off-by: Ross Allan <rallanpcl@gmail.com>