Fix for initial value