Again with fixing the tiny gap problem