WIP: fix a bug