Another attempt to fix correct extension