Fixed some logic on the 1.0.3->1.0.4 compatibility