very last bug fixed