Prevent chunk bursting, add to map after schedule

Signed-off-by: Chris Sanders <zidane@outlook.com>