Fix opening and upcoming issue