BUG: fixed small bug due to merge with branch master