EMERGENCY FIX FOR SINGULO NOT WORKING