Workaround for issue 3068 - v2