Removing workaround