fixup! WIP: before hook