Setup patch by Jason, thanks!