Yet another fix to the matePosition NPE