Further fix for PS editing