same workaround as previous