Workaround #135