Will be fixed as part of #508
Will be fixed as part of #508