Fix stage 20140425