Draugiem integration hotfix...