Minor try at bug-fixing