Removed not working workaround