added temp workaround