fixxxxing bugs 3!