* fixed problems with upcoming