removed last bug