Bug Fix to previous commit