previous 'six' fix was incomplete