Another attempt to fix #480. Workaround.