last ditch efforts
merging Siggi's pull request