Issue #308 - undid previous fix and apply to proper line this time
Merge pull request #313 from nwinklareth/master

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