wrapper as proposed in bug tracked on google code