Bugfix
Somewhat of a reindexing fix
Guards