Removing non thread safe behavior