Resolved compatibility issues with behaviours