#642 - Fixed formatting issue.
#642 - Fixed scope issue.