Actually fixed the problems with #9 and ST3