Modified to remove issue#1