Little unfucked

not tested
Merge pull request #1 from Thyrst/patch-1

Little unfucked