[WIP] fix & test