todo with bug added