This should sort out more targeting corner cases...