fix for initial state