Removed weird modifier handling