Another merge... crap, I must be really stupid.