Hack for issue #2 closes issue #2