Fix #38 fixing Cross issues