Add second part of position check