Workaround more clear and only when needed