Removed weird redundancy