Fix that belongs to #10.