minor further bug fixing