do some fixing from sensiolabs insight