The last one was not a fix. Added a workaround