add @josef-ptk's other fix for ystar