fix state concept