Fixed expand id (issue #70)