Fix for JSS