quick fix with some initializations