Followed Malachite's change