Added extension to prevent bad stuff from happening