Fix ugly hack
Merge pull request #35 from AnyFetch/fix-ugly-hack

Remove ugly hack