Preparing for issue #102