added option to remove warning