Fixed! See below