import Zanzetkuken's fixes from http://dffd.wimbli.com/file.php?id=8014