Added fix to previous commit