:zap: fix for backwards compatibility