Fixed Issue #1, list was trying to access a non-existant list entry