Workaround typogr issue