[WIP] small bug fix