fixing some bugs
another fix