Fidex #22 Fidex #17 Fixed #20