non-paranoia fix.