General Commit: Minor bug fixed