Workaround for 1024 issue