This should solve issue #28