Fix bibberbug