Handled in #179