Will be resolved by #761
Will be resolved by #761