Last fix - Resolving issue #168