small bug (remove stack)