FIXED: two tiny bugs