Fixing functionality.