afaik we already support this! @abenari please review?