Bug fix. Design improvement.