Fix for all `Session/*` folder