Temporary fix for issue #13