Fix for Udi's issue