http://jira.cs.hofstra.edu/browse/CSC-2046
http://jira.cs.hofstra.edu/browse/CSC-2046