Iss5609

Fix for issue :5609