Temporal fix to: http://www.blacktibia.org/t37433p30-otx-server-2xs-doomed-elderberry#231929