AllowUnsafe and bugfix