Fix for issue #2 on development branch.