Last commit resolved #1.