Fixed another issue caused by 'that PR'