FIX refactor error