Issue: 217 and Issue 195
Issue: 217 and Issue 195