Issue #308 - undid previous fix and apply to proper line this time