fix technical issues