[042] Fifed bugs checked