This should resolve #139 for now.