Fix for no space guards missing offsets and version 1.2.3