Ugly fix for "In progress" bugs. The code will need to be refactored later.