Attempt fixing analog code