Temporary fix for issue #3