! This should fix the remaining bugs...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>