Prepared code for issue #66