Further bug-fixing