synced to 1.1 (expand() problem)