Adding modified file for Issue#28