take #5 - fix for usage_key