Suggested fix for the reported issue