forgot to apply some older changes from mark, this is the dll up to commit d5a06b