Fixed issue identified by Entr04y