All worked as intended now, yay!

Signed-off-by: joshpine <josh@digitalcake.co.nz>