some patches from sassy