fix merge with penelope.trac