Bug fix for raptor-no-conflict