changed: Temp workaround for pts issue