Fixing the issue caused by L5 update