Applied new FPS reg. patch from Enrico