Add directionality to keep in step with issue 3541 which is soon to be merged