Fixed thread safety