Fix "by"-bug