Jeff - fix broken feature