Eliminated strange behaviour.