* Bug fix and TODO