hopefully more fixes without new bugs
AllowUnsafe and bugfix