More fixing for issue #6 .