small bug with null fixed