Added workaround (WIP)