why is this needed? It seems like it fixes something which is done rather hacky elsewhere? Is this needed?