Corrected issue identified by Entr04y