Bug Fix and Minor Change