Started fixing other bug :bug: