Issue #474: fixes rename bug