- Fixed algorithm again