Fixed the known bug I introduced