Accepted experimental patch from Captain-Chaos.