fixed ugly patch