This should solve issue #1