Fixed potential (?) problem reported by Klaus (via Philippe)