Fixed based on Patrik's feedback