fixed some keys conflicts