Amendment for fix for issue 376