Bug fix and code refactor.