Completing fix for issue #30.