Issue: small bug fixing