Try to fix potential issue
Updates