Bug fix on initial values