Bug Fix in previous commit