fixes recomended by Even