looks like I'm again through another @aghosn's bug list

/cc @aghosn