Fixed for #2