fixed issue A-2