fixes those bugs