fixed diamond issue