some fixes to previous commit
another fix