Fix conflict with boomerang