Added void detection