fix pic bugs