corner case workaround