Fix Mikkel feedback