Fixed a type and a small bug