Fixed the derivation issue