bug fix (from merge)