Changed the place of the fix so it will always kick in
Merge pull request #10 from hanskr/261c57cd462f359321659a1b8671f5c63cdf16bd

Improvement on the previous pull request