Fix pbw helper