Temporary workaround for dependencies