Igoryen issue#480