1. fx
2. buggy inArray fixed