Need fixes on fen