[#517] Does this work?