Debugging for issue #23.