Small fix and work