* fix my bugs