Now works with SWMH 2.8