Without this fixes, extension doesn't work