Workaround for original task