Fix for Sesame