#1 fix in test mode for this