FITIn: improves handling of some edge cases