ACTUALLY fixed the various problems with #... I hope.