Bug fix...edge case