<Wp-1209> changing back to old code