This fix should avoid the security issue described in bug #492256