Fix for last commit, now working. I know this is bad form, should have branched. =/