What will be our due date for filing an amended 2015 form?

If we are going to amend a 2015 tax form that a tax preparer originally filed on March 3, 2016, do we still have until April 18, 2019 to have the amended form in?  Always confusing when they say 3 years form the date the original was filed.