fixed small bug with logging
merge
merge?