Possible fix for issue 30.