Fixed potential issue