Fix Valentin's bug