Fixing Expose Behaviour