Bug fix and external dependency