Fixed workaround