Proceeding work on fixing (should be done thou, needs just some extra work)