Fixing #21 and a upgrade problem to a unl. plan