small bug fix
merge