Fixing Motivation functionality