fix some issue from zoe