new #1
fixed #2