Fix build hangup