Bug temporary workaround