Remove the hardcoded padding size, use a trick to detect it at runtime