Boris' fix for analysis