Fixed the previous issue properly!