fixed borderColor issues