fixes by sreanshots