WIP: try to fix small bug