border case bugs eliminated