* This should fix it hanging...