Addressing some comments. Fixed a bug introduced by combo of commits.