Fix for issue #2 on experimental branch (splint).