Added for wp-676