fix for PS1.0