jasmin fixes II