added singularborders patch