fix bugs in particular cases

Signed-off-by: Andrea Corna <andrea.corna.ac.91@gmail.com>