minor bug fixing

committed merely for source sync

--NOT DISTRIBUTABLE--