Fixed the DeviceCondition which was not aligned