[#34]: Resolve issue with SessionAttributes