removed strange behaviour