Fix optional second diablo problem