Changed how Void is detected