Fix for issue #147 - analyzer warning