Fix Penn Space problem.. Method needs testing