Fixed better check inline with 2.x