Should be more robust now.