Corrected bug due to previous commit