override fix for simple mode