Another fix
Merge pull request #167 from dreamteam69/master

Another fix