Added a workaround for a bug in Boost::Variant (<1.55)