Merge pull request #855 from MrPetovan/task/remove-fortunate