conditional fix, padding added