Tuning edge cases behaviour