Workaround try #2