[#209][UX,xs] Fixes #209