Added hack for missing number of vertices