Corrected a bug in b9cede9cd265e408cd21b3bb15a16fa724893085