fix #124

@financeCoding, this fixes #124. It's a little brut force but does get the job done; please let me know if you can see a better way.