#3 Placing in a better place the fix for the different Surfaces