WIP: fix secure