Workaround for incorrect variant entry; fix #11