Zeljko, the trunk's commit does not apply directly to fixes branch because of the refactoring, but in this case the whole functions were just moved to another unit and your code changes can be made easily for fixes. Juha