#29 Prepare tasks fixup