Added entry and small bug fix