Bugfix release (prevent race conditions)